Fix "cannot open display" error message when display is set by the DISPLAY

2007-10-15  Loïc Minier  <lool@dooz.org>

        * gtk/gtkmain.c: (gtk_init): Fix "cannot open display" error message
        when display is set by the DISPLAY env var. (#486636, Mike Hommey)

svn path=/trunk/; revision=18909

diff --git a/ChangeLog b/ChangeLog
index 662af03a2d773121d7cfd19c8cb077bdb586109e..757bb28313bed2db86d7ff6197408649634c0e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15  Loïc Minier  <lool@dooz.org>
+
+       * gtk/gtkmain.c: (gtk_init): Fix "cannot open display" error message
+       when display is set by the DISPLAY env var. (#486636, Mike Hommey)
+
 2007-10-13  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtk-builder-convert 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 910d93fb2a49d2cb20a8597269686aa6dfac6a69..47d615546c596cc92a3695a4a87b9282b0c69909 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -933,7 +933,9 @@ gtk_init (int *argc, char ***argv)
   if (!gtk_init_check (argc, argv))
     {
       const char *display_name_arg = gdk_get_display_arg_name ();
-      g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " ");
+      if (display_name_arg == NULL)
+        display_name_arg = getenv("DISPLAY");
+      g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : "");
       exit (1);
     }
 }